Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Nov 2011 02:24:15 +0000 (19:24 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Nov 2011 02:24:15 +0000 (19:24 -0700)

Trivial merge